Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Fri, 18 Nov 2011 18:30:43 +0000 (10:30 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Fri, 18 Nov 2011 18:30:43 +0000 (10:30 -0800)
commit1e9847276c3ce48d6147276dac979001c2edddfc
tree732d4f708dea6f7a6045f700eb816cc36d93e338
parent1fd9556a2353c9c0afff0eb1778714eb51e945e7
parentad6ca033e2cf2956252002e1b18f83a956e69339
Merge from trunk.